Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: promisify all api methods that accept callbacks #381

Merged
merged 5 commits into from
Jul 29, 2019
Merged

Conversation

achingbrain
Copy link
Member

@achingbrain achingbrain commented Jul 18, 2019

This is a stop-gap until the full async/await migration can be completed. It means we can refactor tests of other modules that depend on this module without having to mix async flow control strategies.

N.b. some methods that were previously callable without callbacks (e.g. node.start(), node.stop(), etc) now require callbacks otherwise a promise is returned which, if rejected, can cause unhandledPromiseRejection events and lead to memory leaks where exceptions are thrown and resources are not cleaned up.

This is a stop-gap until the full async/await migration can be
completed.  It means we can refactor tests of other modules that
depend on this module without having to mix async flow control
strategies.

N.b. some methods that were previously callable without callbacks
(e.g. `node.start()`, `node.stop()`, etc) now require callbacks
otherwise a promise is returned which, if rejected, can cause
`unhandledPromiseRejection` events and lead to memory leaks.
Copy link
Member

@vasco-santos vasco-santos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jacobheun
Copy link
Contributor

We need to update the readme for this. Since @achingbrain is out, I'll go ahead and update that.

@jacobheun
Copy link
Contributor

I went ahead and added a generic note at the top of the API section about promisify support and the move to async/await. I think it makes sense to update the API code once we do the actual switch over here, in case there are any changes to the way the api behaves.

@jacobheun jacobheun requested a review from vasco-santos July 23, 2019 20:06
Copy link
Member

@vasco-santos vasco-santos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding that to the docs Jacob!

src/pubsub.js Outdated
if (!node.isStarted() && !floodSub.started) {
return nextTick(callback, errCode(new Error(messages.NOT_STARTED_YET), codes.PUBSUB_NOT_STARTED))
}
if (!handler && !callback) {
if (!callback) {
Copy link
Contributor

@jacobheun jacobheun Jul 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to be a breaking change. Currently js-ipfs calls self.libp2p.pubsub.unsubscribe(topic, handler), which will end up resulting in this calling handler as a callback. We'll need to do this as a minor release and then update js-ipfs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was aiming to have this and gossipsub added for a new minor release

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would be ideal to release them together. I think I could also do #384 (pulling in the core modules) as part of the same minor.

The unfortunate thing about this logic is that if you want to unsubscribe a single handler, you have to use callbacks, otherwise we assume the handler is a callback.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For #384 we will also have to get the tests for those modules here, as well as probably refactor some stuff, as I believe we will end up with a lot of replicated stuff. So, unless you feel that #384 will not take a long time, I think we should get those 2, as they are kind of ready to go. And we can unblock gossipsub on js-libp2p and js-ipfs, and more async migration work.


yeah, I see it. This is a tricky case because of the 2 last arguments with a function

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open a PR for 384 and if it's not ready by then, we can release without it. I don't want to hold anything up with.


A different route we could go is to return Promise.resolve() if callback is not defined. The caveat of this approach is that if you want to unsubscribe from everything, you have to provide a null or undefined handler, but you don't have to use callbacks ever.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, it is more coherent with the API to do what you suggest. But, we need to have proper docs for help on that

Copy link
Contributor

@jacobheun jacobheun Jul 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can note the difference in the readme, and maybe add an example of the calls to the jsdocs for the method to help. The docs currently point to the ipfs interface for the api, which describes the calls as one of:

await libp2p.unsubscribe(topic)
await libp2p.unsubscribe(topic, handler)
libp2p.unsubscribe(topic, handler, callback)

as the code currently is, the first two calls are the same through promisify. With my recommended changes we'd temporarily have the following until we go full async/await:

await libp2p.unsubscribe(topic, null)
await libp2p.unsubscribe(topic, handler)
libp2p.unsubscribe(topic, handler, callback)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think we can go with that approach

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vasco-santos I am thinking of opening an additional PR to fix the subscribe method since we're doing a breaking change. Right now, the order of params (topic, options, handler, callback) does not match the interface api, it would be nice to correct that with this release. I can add jsdocs for it and the rest of the pubsub methods in that PR. What do you think?

@jacobheun jacobheun requested a review from vasco-santos July 26, 2019 14:40
@jacobheun jacobheun mentioned this pull request Jul 29, 2019
19 tasks
@jacobheun
Copy link
Contributor

@vasco-santos this is ready for one last review pass and should be good to merge. I had to fix some tests due to the pubsub change and a recent release of the delegate content router.

Copy link
Member

@vasco-santos vasco-santos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me! You can merge it

@jacobheun jacobheun merged commit df6ef45 into master Jul 29, 2019
@jacobheun jacobheun deleted the async-await branch July 29, 2019 13:40
maschad pushed a commit to maschad/js-libp2p that referenced this pull request Jun 21, 2023
This fixes a bug where `ADD_PROVIDER` message keys were CID bytes instead of multihash bytes, and changes the CIDs generated in tests to be V1s with `raw` codec instead of V0s so that the difference is actually tested.

Fixes libp2p#381
maschad pushed a commit to maschad/js-libp2p that referenced this pull request Jun 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants